Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 16:21:14 +0000 (09:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 16:21:14 +0000 (09:21 -0700)

Trivial merge